From: Jan D. <jan.h.d@swipnet.se>
Date: Mon, 25 Jul 2011 21:49:42 +0000 (+0200)
Subject: * nsmenu.m (ns_popup_dialog): Add an "ok" button if no buttons
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2723
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=aa7c58d68784f32e8c87996bb9396ca8cf7f154d;p=emacs.git

* nsmenu.m (ns_popup_dialog): Add an "ok" button if no buttons
are specified.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 97ddbcc1db9..ecf4c0f6c75 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-25  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsmenu.m (ns_popup_dialog): Add an "ok" button if no buttons
+	are specified (Bug#9168).
+
 2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* bidi.c (bidi_dump_cached_states): Fix printf format mismatch.
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 6a9ee7dd4f5..6931b7a3c01 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1340,7 +1340,7 @@ Lisp_Object
 ns_popup_dialog (Lisp_Object position, Lisp_Object contents, Lisp_Object header)
 {
   id dialog;
-  Lisp_Object window, tem;
+  Lisp_Object window, tem, title;
   struct frame *f;
   NSPoint p;
   BOOL isQ;
@@ -1389,6 +1389,14 @@ ns_popup_dialog (Lisp_Object position, Lisp_Object contents, Lisp_Object header)
   p.x = (int)f->left_pos + ((int)FRAME_COLUMN_WIDTH (f) * f->text_cols)/2;
   p.y = (int)f->top_pos + (FRAME_LINE_HEIGHT (f) * f->text_lines)/2;
 
+  title = Fcar (contents);
+  CHECK_STRING (title);
+
+  if (NILP (Fcar (Fcdr (contents))))
+    /* No buttons specified, add an "Ok" button so users can pop down
+       the dialog.  */
+    contents = Fcons (title, Fcons (Fcons (build_string ("Ok"), Qt), Qnil));
+
   BLOCK_INPUT;
   dialog = [[EmacsDialogPanel alloc] initFromContents: contents
                                            isQuestion: isQ];